get sizes an icon set can render without falling back to missing image
authorHavoc Pennington <hp@redhat.com>
Fri, 25 May 2001 20:41:46 +0000 (20:41 +0000)
committerHavoc Pennington <hp@src.gnome.org>
Fri, 25 May 2001 20:41:46 +0000 (20:41 +0000)
2001-05-25  Havoc Pennington  <hp@redhat.com>

* gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
set can render without falling back to missing image icon

* gtk/gtktextview.c (gtk_text_view_size_request): request full
size of text, instead of random values

* gtk/gtktreeview.c (gtk_tree_view_size_request): request full
size of tree view, instead of random values

* gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
image in an appropriate size

        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/

        Throughout: fix GTK_STOCK_BUTTON_ instances

* gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
Add a bunch of new stock items/icons

* gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
new function, convenience for inserting columns with a data func

* gtk/gtkiconfactory.c: keep a list of all existing icon factories
(_gtk_icon_factory_list_ids): use list of all factories to
generate a list of all known IDs

* gtk/gtkstock.c (gtk_stock_list_ids): replace
gtk_stock_list_items() with a function that returns all IDs known
including those for GtkIconFactory.

138 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
demos/gtk-demo/Makefile.am
demos/gtk-demo/button_box.c
demos/gtk-demo/dialog.c
demos/gtk-demo/sizegroup.c
docs/reference/gtk/gtk-sections.txt
docs/reference/gtk/tmpl/gtk-unused.sgml
docs/reference/gtk/tmpl/gtkstock.sgml
gtk/gtkbutton.c
gtk/gtkcolorseldialog.c
gtk/gtkdialog.c
gtk/gtkfilesel.c
gtk/gtkfontsel.c
gtk/gtkiconfactory.c
gtk/gtkiconfactory.h
gtk/gtkmessagedialog.c
gtk/gtkstock.c
gtk/gtkstock.h
gtk/gtktextview.c
gtk/gtktreeview.c
gtk/gtktreeview.h
gtk/gtkwidget.c
gtk/stock-icons/Makefile.am
gtk/stock-icons/stock_add.png [new file with mode: 0644]
gtk/stock-icons/stock_add_24.png [new file with mode: 0644]
gtk/stock-icons/stock_align_center.png [new file with mode: 0644]
gtk/stock-icons/stock_align_center_24.png [new file with mode: 0644]
gtk/stock-icons/stock_align_justify.png [new file with mode: 0644]
gtk/stock-icons/stock_align_justify_24.png [new file with mode: 0644]
gtk/stock-icons/stock_align_left.png [new file with mode: 0644]
gtk/stock-icons/stock_align_left_24.png [new file with mode: 0644]
gtk/stock-icons/stock_align_right.png [new file with mode: 0644]
gtk/stock-icons/stock_align_right_24.png [new file with mode: 0644]
gtk/stock-icons/stock_bottom.png [new file with mode: 0644]
gtk/stock-icons/stock_bottom_24.png [new file with mode: 0644]
gtk/stock-icons/stock_cdrom.png [new file with mode: 0644]
gtk/stock-icons/stock_cdrom_24.png [new file with mode: 0644]
gtk/stock-icons/stock_clear.png [new file with mode: 0644]
gtk/stock-icons/stock_clear_24.png [new file with mode: 0644]
gtk/stock-icons/stock_colorselector.png [new file with mode: 0644]
gtk/stock-icons/stock_colorselector_24.png [new file with mode: 0644]
gtk/stock-icons/stock_convert.png [new file with mode: 0644]
gtk/stock-icons/stock_convert_24.png [new file with mode: 0644]
gtk/stock-icons/stock_copy.png [new file with mode: 0644]
gtk/stock-icons/stock_copy_24.png [new file with mode: 0644]
gtk/stock-icons/stock_cut.png [new file with mode: 0644]
gtk/stock-icons/stock_cut_24.png [new file with mode: 0644]
gtk/stock-icons/stock_down_arrow.png [new file with mode: 0644]
gtk/stock-icons/stock_down_arrow_24.png [new file with mode: 0644]
gtk/stock-icons/stock_exec.png [new file with mode: 0644]
gtk/stock-icons/stock_exec_24.png [new file with mode: 0644]
gtk/stock-icons/stock_first.png [new file with mode: 0644]
gtk/stock-icons/stock_first_24.png [new file with mode: 0644]
gtk/stock-icons/stock_font.png [new file with mode: 0644]
gtk/stock-icons/stock_font_24.png [new file with mode: 0644]
gtk/stock-icons/stock_home.png [new file with mode: 0644]
gtk/stock-icons/stock_home_24.png [new file with mode: 0644]
gtk/stock-icons/stock_index.png [new file with mode: 0644]
gtk/stock-icons/stock_index_24.png [new file with mode: 0644]
gtk/stock-icons/stock_jump_to.png [new file with mode: 0644]
gtk/stock-icons/stock_jump_to_24.png [new file with mode: 0644]
gtk/stock-icons/stock_last.png [new file with mode: 0644]
gtk/stock-icons/stock_last_24.png [new file with mode: 0644]
gtk/stock-icons/stock_left_arrow.png [new file with mode: 0644]
gtk/stock-icons/stock_left_arrow_24.png [new file with mode: 0644]
gtk/stock-icons/stock_menu_print_preview.png [new file with mode: 0644]
gtk/stock-icons/stock_menu_sort_descending.png [new file with mode: 0644]
gtk/stock-icons/stock_paste.png [new file with mode: 0644]
gtk/stock-icons/stock_paste_24.png [new file with mode: 0644]
gtk/stock-icons/stock_preferences.png [new file with mode: 0644]
gtk/stock-icons/stock_preferences_24.png [new file with mode: 0644]
gtk/stock-icons/stock_print.png [new file with mode: 0644]
gtk/stock-icons/stock_print_24.png [new file with mode: 0644]
gtk/stock-icons/stock_print_preview.png [new file with mode: 0644]
gtk/stock-icons/stock_print_preview_16.png [new file with mode: 0644]
gtk/stock-icons/stock_print_preview_24.png [new file with mode: 0644]
gtk/stock-icons/stock_properties.png [new file with mode: 0644]
gtk/stock-icons/stock_properties_24.png [new file with mode: 0644]
gtk/stock-icons/stock_redo.png [new file with mode: 0644]
gtk/stock-icons/stock_redo_24.png [new file with mode: 0644]
gtk/stock-icons/stock_refresh.png [new file with mode: 0644]
gtk/stock-icons/stock_refresh_24.png [new file with mode: 0644]
gtk/stock-icons/stock_remove.png [new file with mode: 0644]
gtk/stock-icons/stock_remove_24.png [new file with mode: 0644]
gtk/stock-icons/stock_revert.png [new file with mode: 0644]
gtk/stock-icons/stock_revert_24.png [new file with mode: 0644]
gtk/stock-icons/stock_right_arrow.png [new file with mode: 0644]
gtk/stock-icons/stock_right_arrow_24.png [new file with mode: 0644]
gtk/stock-icons/stock_save_as.png [new file with mode: 0644]
gtk/stock-icons/stock_save_as_24.png [new file with mode: 0644]
gtk/stock-icons/stock_search.png [new file with mode: 0644]
gtk/stock-icons/stock_search_24.png [new file with mode: 0644]
gtk/stock-icons/stock_search_replace.png [new file with mode: 0644]
gtk/stock-icons/stock_search_replace_24.png [new file with mode: 0644]
gtk/stock-icons/stock_sort_ascending.png [new file with mode: 0644]
gtk/stock-icons/stock_sort_ascending_24.png [new file with mode: 0644]
gtk/stock-icons/stock_sort_descending.png [new file with mode: 0644]
gtk/stock-icons/stock_sort_descending_16.png [new file with mode: 0644]
gtk/stock-icons/stock_sort_descending_24.png [new file with mode: 0644]
gtk/stock-icons/stock_spellcheck.png [new file with mode: 0644]
gtk/stock-icons/stock_spellcheck_24.png [new file with mode: 0644]
gtk/stock-icons/stock_stop.png [new file with mode: 0644]
gtk/stock-icons/stock_stop_24.png [new file with mode: 0644]
gtk/stock-icons/stock_text_bold.png [new file with mode: 0644]
gtk/stock-icons/stock_text_bold_24.png [new file with mode: 0644]
gtk/stock-icons/stock_text_italic.png [new file with mode: 0644]
gtk/stock-icons/stock_text_italic_24.png [new file with mode: 0644]
gtk/stock-icons/stock_text_strikeout.png [new file with mode: 0644]
gtk/stock-icons/stock_text_strikeout_24.png [new file with mode: 0644]
gtk/stock-icons/stock_text_strikethrough_24.png [new file with mode: 0644]
gtk/stock-icons/stock_text_underline.png [new file with mode: 0644]
gtk/stock-icons/stock_text_underline_24.png [new file with mode: 0644]
gtk/stock-icons/stock_top.png [new file with mode: 0644]
gtk/stock-icons/stock_top_24.png [new file with mode: 0644]
gtk/stock-icons/stock_trash.png [new file with mode: 0644]
gtk/stock-icons/stock_trash_24.png [new file with mode: 0644]
gtk/stock-icons/stock_undelete.png [new file with mode: 0644]
gtk/stock-icons/stock_undelete_24.png [new file with mode: 0644]
gtk/stock-icons/stock_undo.png [new file with mode: 0644]
gtk/stock-icons/stock_undo_24.png [new file with mode: 0644]
gtk/stock-icons/stock_up_arrow.png [new file with mode: 0644]
gtk/stock-icons/stock_up_arrow_24.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_1.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_1_24.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_fit.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_fit_24.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_in.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_in_24.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_out.png [new file with mode: 0644]
gtk/stock-icons/stock_zoom_out_24.png [new file with mode: 0644]
tests/testgtk.c
tests/testtext.c

index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 95f96d091d0558ddf9b611fb6e0cc3e54475d23a..f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1 100644 (file)
@@ -1,3 +1,37 @@
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+       
+       * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
+       set can render without falling back to missing image icon
+
+       * gtk/gtktextview.c (gtk_text_view_size_request): request full
+       size of text, instead of random values
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): request full
+       size of tree view, instead of random values
+
+       * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback
+       image in an appropriate size
+
+        * gtk/gtkstock.h: Rename the stock items including _BUTTON_,
+       etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/
+
+        Throughout: fix GTK_STOCK_BUTTON_ instances
+       
+       * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h,
+       gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am:
+       Add a bunch of new stock items/icons
+
+       * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):
+       new function, convenience for inserting columns with a data func
+
+       * gtk/gtkiconfactory.c: keep a list of all existing icon factories
+       (_gtk_icon_factory_list_ids): use list of all factories to
+       generate a list of all known IDs
+
+       * gtk/gtkstock.c (gtk_stock_list_ids): replace
+       gtk_stock_list_items() with a function that returns all IDs known
+       including those for GtkIconFactory.
+
 2001-05-25  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkgc-win32.c : made fil mode GDK_STIPPLED actually
index 228296aec07c126480fb34c78257d09be2505d06..a25c647dd6ac981d4be3d7a3869d31837e5f2b4d 100644 (file)
@@ -15,6 +15,7 @@ demos = @STRIP_BEGIN@ \
        panes.c         \
        pixbufs.c       \
        sizegroup.c     \
+       stock_browser.c \
        textview.c      \
 @STRIP_END@
 
index 286610ea3bac6ed7a2ac21a99d43db8856ee720b..f4527a833135138622e90aa8d97d11ffe1e06552 100644 (file)
@@ -28,10 +28,10 @@ create_bbox (gint  horizontal,
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
   
-  button = gtk_button_new_from_stock (GTK_STOCK_BUTTON_OK);
+  button = gtk_button_new_from_stock (GTK_STOCK_OK);
   gtk_container_add (GTK_CONTAINER (bbox), button);
   
-  button = gtk_button_new_from_stock (GTK_STOCK_BUTTON_CANCEL);
+  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
   gtk_container_add (GTK_CONTAINER (bbox), button);
   
   button = gtk_button_new_from_stock (GTK_STOCK_HELP);
index 0e995201624a0beeef392aee3567074940f2e3aa..92358b973ac24c4907c6201436741f238f6afff0 100644 (file)
@@ -44,7 +44,7 @@ interactive_dialog_clicked (GtkButton *button,
   dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                        GTK_WINDOW (window),
                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
-                                       GTK_STOCK_BUTTON_OK,
+                                       GTK_STOCK_OK,
                                        GTK_RESPONSE_OK,
                                        NULL);
 
index 362ffcbc02fece232223de6ca06ab4645274ed1f..2bd3022e2b16f585a28d0c32845dabfbacd02e0d 100644 (file)
@@ -110,7 +110,7 @@ do_sizegroup (void)
     {
       window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
                                            NULL, 0,
-                                           GTK_STOCK_BUTTON_CLOSE,
+                                           GTK_STOCK_CLOSE,
                                            GTK_RESPONSE_NONE,
                                            NULL);
       gtk_window_set_resizeable (GTK_WINDOW (window), FALSE);
index ff80a8b7c25ff688043692031c62aa43979e12e2..b687e6129ee6d6b2e5e5bc0918f6adad682b445c 100644 (file)
@@ -3784,26 +3784,77 @@ gtk_stock_add
 gtk_stock_add_static
 gtk_stock_item_copy
 gtk_stock_item_free
-gtk_stock_list_items
+gtk_stock_list_ids
 gtk_stock_lookup
 <SUBSECTION Stock IDs>
-GTK_STOCK_BUTTON_APPLY
-GTK_STOCK_BUTTON_CANCEL
-GTK_STOCK_BUTTON_CLOSE
-GTK_STOCK_BUTTON_NO
-GTK_STOCK_BUTTON_OK
-GTK_STOCK_BUTTON_YES
+GTK_STOCK_ADD
+GTK_STOCK_APPLY
+GTK_STOCK_BOLD
+GTK_STOCK_CANCEL
+GTK_STOCK_CDROM
+GTK_STOCK_CLEAR
+GTK_STOCK_CLOSE
+GTK_STOCK_CONVERT
+GTK_STOCK_COPY
+GTK_STOCK_CUT
+GTK_STOCK_DELETE
 GTK_STOCK_DIALOG_ERROR
 GTK_STOCK_DIALOG_INFO
 GTK_STOCK_DIALOG_QUESTION
 GTK_STOCK_DIALOG_WARNING
+GTK_STOCK_EXECUTE
+GTK_STOCK_FIND
+GTK_STOCK_FIND_AND_REPLACE
+GTK_STOCK_FLOPPY
+GTK_STOCK_GOTO_BOTTOM
+GTK_STOCK_GOTO_FIRST
+GTK_STOCK_GOTO_LAST
+GTK_STOCK_GOTO_TOP
+GTK_STOCK_GO_BACK
+GTK_STOCK_GO_DOWN
+GTK_STOCK_GO_FORWARD
+GTK_STOCK_GO_UP
 GTK_STOCK_HELP
+GTK_STOCK_HOME
+GTK_STOCK_INDEX
+GTK_STOCK_ITALIC
+GTK_STOCK_JUMP_TO
+GTK_STOCK_JUSTIFY_CENTER
+GTK_STOCK_JUSTIFY_FILL
+GTK_STOCK_JUSTIFY_LEFT
+GTK_STOCK_JUSTIFY_RIGHT
+GTK_STOCK_MISSING_IMAGE
 GTK_STOCK_NEW
+GTK_STOCK_NO
+GTK_STOCK_OK
 GTK_STOCK_OPEN
+GTK_STOCK_PASTE
+GTK_STOCK_PREFERENCES
+GTK_STOCK_PRINT
+GTK_STOCK_PRINT_PREVIEW
+GTK_STOCK_PROPERTIES
 GTK_STOCK_QUIT
+GTK_STOCK_REDO
+GTK_STOCK_REFRESH
+GTK_STOCK_REMOVE
+GTK_STOCK_REVERT_TO_SAVED
 GTK_STOCK_SAVE
-GTK_STOCK_CLOSE
-GTK_STOCK_MISSING_IMAGE
+GTK_STOCK_SAVE_AS
+GTK_STOCK_SELECT_COLOR
+GTK_STOCK_SELECT_FONT
+GTK_STOCK_SORT_ASCENDING
+GTK_STOCK_SORT_DESCENDING
+GTK_STOCK_SPELL_CHECK
+GTK_STOCK_STOP
+GTK_STOCK_STRIKETHROUGH
+GTK_STOCK_UNDELETE
+GTK_STOCK_UNDERLINE
+GTK_STOCK_UNDO
+GTK_STOCK_YES
+GTK_STOCK_ZOOM_100
+GTK_STOCK_ZOOM_FIT
+GTK_STOCK_ZOOM_IN
+GTK_STOCK_ZOOM_OUT
 </SECTION>
 
 
index ec5c6e497bef8e09813b485fd14bff3fb7e8f5ee..4861e73861c59fdc2984f3fc0d982598b6e95c19 100644 (file)
@@ -209,6 +209,42 @@ Get the array of signals defined for this object.
 
 @obj: the object to fetch the signals from.
 
+<!-- ##### MACRO GTK_STOCK_BUTTON_APPLY ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_STOCK_BUTTON_CANCEL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_STOCK_BUTTON_CLOSE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_STOCK_BUTTON_NO ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_STOCK_BUTTON_OK ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_STOCK_BUTTON_YES ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GTK_TREE_SELECTION ##### -->
 <para>
 A macro that returns a GList that contains the selection of the root tree of @obj.
@@ -1467,6 +1503,13 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
 @spin_button: a #GtkSpinButton
 @shadow_type: the new border type.
 
+<!-- ##### FUNCTION gtk_stock_list_items ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
 <!-- ##### FUNCTION gtk_trace_referencing ##### -->
 <para>
 Private: print debugging information while doing a gtk_object_ref() or 
index 9fb8fe7640b2afcd6ee3f35fc8364f3da343c1fd..f778b87bf1c578c274f25e52287a9aec1ea3a8d2 100644 (file)
@@ -64,7 +64,7 @@ Stock Items
 @item: 
 
 
-<!-- ##### FUNCTION gtk_stock_list_items ##### -->
+<!-- ##### FUNCTION gtk_stock_list_ids ##### -->
 <para>
 
 </para>
@@ -82,42 +82,77 @@ Stock Items
 @Returns: 
 
 
-<!-- ##### MACRO GTK_STOCK_BUTTON_APPLY ##### -->
+<!-- ##### MACRO GTK_STOCK_ADD ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO GTK_STOCK_BUTTON_CANCEL ##### -->
+<!-- ##### MACRO GTK_STOCK_APPLY ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO GTK_STOCK_BUTTON_CLOSE ##### -->
+<!-- ##### MACRO GTK_STOCK_BOLD ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO GTK_STOCK_BUTTON_NO ##### -->
+<!-- ##### MACRO GTK_STOCK_CANCEL ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO GTK_STOCK_BUTTON_OK ##### -->
+<!-- ##### MACRO GTK_STOCK_CDROM ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO GTK_STOCK_BUTTON_YES ##### -->
+<!-- ##### MACRO GTK_STOCK_CLEAR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_CLOSE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_CONVERT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_COPY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_CUT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_DELETE ##### -->
 <para>
 
 </para>
@@ -152,6 +187,90 @@ Stock Items
 
 
 
+<!-- ##### MACRO GTK_STOCK_EXECUTE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_FIND ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_FIND_AND_REPLACE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_FLOPPY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GOTO_BOTTOM ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GOTO_FIRST ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GOTO_LAST ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GOTO_TOP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GO_BACK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GO_DOWN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GO_FORWARD ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_GO_UP ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO GTK_STOCK_HELP ##### -->
 <para>
 
@@ -159,6 +278,69 @@ Stock Items
 
 
 
+<!-- ##### MACRO GTK_STOCK_HOME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_INDEX ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_ITALIC ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_JUMP_TO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_JUSTIFY_CENTER ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_JUSTIFY_FILL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_JUSTIFY_LEFT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_JUSTIFY_RIGHT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_MISSING_IMAGE ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO GTK_STOCK_NEW ##### -->
 <para>
 
@@ -166,6 +348,20 @@ Stock Items
 
 
 
+<!-- ##### MACRO GTK_STOCK_NO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_OK ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO GTK_STOCK_OPEN ##### -->
 <para>
 
@@ -173,6 +369,41 @@ Stock Items
 
 
 
+<!-- ##### MACRO GTK_STOCK_PASTE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_PREFERENCES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_PRINT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_PRINT_PREVIEW ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_PROPERTIES ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO GTK_STOCK_QUIT ##### -->
 <para>
 
@@ -180,6 +411,34 @@ Stock Items
 
 
 
+<!-- ##### MACRO GTK_STOCK_REDO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_REFRESH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_REMOVE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_REVERT_TO_SAVED ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO GTK_STOCK_SAVE ##### -->
 <para>
 
@@ -187,14 +446,112 @@ Stock Items
 
 
 
-<!-- ##### MACRO GTK_STOCK_CLOSE ##### -->
+<!-- ##### MACRO GTK_STOCK_SAVE_AS ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO GTK_STOCK_MISSING_IMAGE ##### -->
+<!-- ##### MACRO GTK_STOCK_SELECT_COLOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_SELECT_FONT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_SORT_ASCENDING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_SORT_DESCENDING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_SPELL_CHECK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_STOP ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_STRIKETHROUGH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_UNDELETE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_UNDERLINE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_UNDO ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_YES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_ZOOM_100 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_ZOOM_FIT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_ZOOM_IN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_STOCK_ZOOM_OUT ##### -->
 <para>
 
 </para>
index 8cbe10556935a399491a74e73e714b82aba1f43d..69dc58390ac826342298b234b2774b46d53b9d1c 100644 (file)
@@ -361,8 +361,8 @@ gtk_button_new_with_label (const gchar *label)
  * @returns: a new #GtkButton
  *
  * Creates a new #GtkButton containing the image and text from a stock item.
- * Some stock ids have preprocessor macros like #GTK_STOCK_BUTTON_OK and
- * #GTK_STOCK_BUTTON_APPLY.
+ * Some stock ids have preprocessor macros like #GTK_STOCK_OK and
+ * #GTK_STOCK_APPLY.
  **/
 GtkWidget*
 gtk_button_new_from_stock (const gchar   *stock_id)
index a80f28e717401f1ab85ba2ddfe8d920101907c2b..7dd1e97e6e01834e462c000672009991f6d6d1d5 100644 (file)
@@ -97,13 +97,13 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   action_area_button_box = GTK_DIALOG (colorseldiag)->action_area;
 
   colorseldiag->ok_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
-                                                   GTK_STOCK_BUTTON_OK,
+                                                   GTK_STOCK_OK,
                                                    GTK_RESPONSE_OK);
                                                    
   gtk_widget_grab_default (colorseldiag->ok_button);
   
   colorseldiag->cancel_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
-                                                       GTK_STOCK_BUTTON_CANCEL,
+                                                       GTK_STOCK_CANCEL,
                                                        GTK_RESPONSE_CANCEL);
   
   colorseldiag->help_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
index c0f0ea1181cda4a050c833c92cfa9121e6c6e7ff..9e7e2ae68c2c829a1e4ca6c48e09e6e5f0b58ad7 100644 (file)
@@ -359,7 +359,7 @@ gtk_dialog_new_empty (const gchar     *title,
  * (GTK_DIALOG_DESTROY_WITH_PARENT). After @flags, button
  * text/response ID pairs should be listed, with a NULL pointer ending
  * the list. Button text can be either a stock ID such as
- * GTK_STOCK_BUTTON_OK, or some arbitrary text.  A response ID can be
+ * #GTK_STOCK_OK, or some arbitrary text.  A response ID can be
  * any positive number, or one of the values in the #GtkResponseType
  * enumeration. If the user clicks one of these dialog buttons,
  * #GtkDialog will emit the "response" signal with the corresponding
@@ -375,9 +375,9 @@ gtk_dialog_new_empty (const gchar     *title,
  *  GtkWidget *dialog = gtk_dialog_new_with_buttons ("My dialog",
  *                                                   main_app_window,
  *                                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- *                                                   GTK_STOCK_BUTTON_OK,
+ *                                                   GTK_STOCK_OK,
  *                                                   GTK_RESPONSE_ACCEPT,
- *                                                   GTK_STOCK_BUTTON_CANCEL,
+ *                                                   GTK_STOCK_CANCEL,
  *                                                   GTK_RESPONSE_REJECT,
  *                                                   NULL);
  * </programlisting>
index 6da7f1eb23295a84e734e40d88bfc0201c04160e..4036bf4519f78081243f45dc7d03144694a1ae96 100644 (file)
@@ -678,14 +678,14 @@ gtk_file_selection_init (GtkFileSelection *filesel)
 
   /*  The OK button  */
   filesel->ok_button = gtk_dialog_add_button (dialog,
-                                              GTK_STOCK_BUTTON_OK,
+                                              GTK_STOCK_OK,
                                               GTK_RESPONSE_OK);
   
   gtk_widget_grab_default (filesel->ok_button);
 
   /*  The Cancel button  */
   filesel->cancel_button = gtk_dialog_add_button (dialog,
-                                                  GTK_STOCK_BUTTON_CANCEL,
+                                                  GTK_STOCK_CANCEL,
                                                   GTK_RESPONSE_CANCEL);
 
   /*  The selection entry widget  */
index c3e169df9123fbf67ccf1752a59246661a4f2876..00ea3e990051d0af810ca4be586bf7f27daaa3fa 100644 (file)
@@ -987,18 +987,18 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
   fontseldiag->action_area = dialog->action_area;
   
   fontseldiag->ok_button = gtk_dialog_add_button (dialog,
-                                                  GTK_STOCK_BUTTON_OK,
+                                                  GTK_STOCK_OK,
                                                   GTK_RESPONSE_OK);
   gtk_widget_grab_default (fontseldiag->ok_button);
   
   fontseldiag->apply_button = gtk_dialog_add_button (dialog,
-                                                     GTK_STOCK_BUTTON_APPLY,
+                                                     GTK_STOCK_APPLY,
                                                      GTK_RESPONSE_APPLY);
   gtk_widget_hide (fontseldiag->apply_button);
 
   
   fontseldiag->cancel_button = gtk_dialog_add_button (dialog,
-                                                      GTK_STOCK_BUTTON_CANCEL,
+                                                      GTK_STOCK_CANCEL,
                                                       GTK_RESPONSE_CANCEL);
 
   gtk_window_set_title (GTK_WINDOW (fontseldiag),
index 7a2ddbca466f324a417dd273241aa8e3f1c6614e..117faeaaced0c0a95dcd02f9e363e5e2341bc56b 100644 (file)
@@ -33,6 +33,8 @@
 #include <ctype.h>
 #include <string.h>
 
+static GSList *all_icon_factories = NULL;
+
 struct _GtkIconSource
 {
   /* Either filename or pixbuf can be NULL. If both are non-NULL,
@@ -97,6 +99,7 @@ static void
 gtk_icon_factory_init (GtkIconFactory *factory)
 {
   factory->icons = g_hash_table_new (g_str_hash, g_str_equal);
+  all_icon_factories = g_slist_prepend (all_icon_factories, factory);
 }
 
 static void
@@ -121,6 +124,8 @@ gtk_icon_factory_finalize (GObject *object)
 {
   GtkIconFactory *factory = GTK_ICON_FACTORY (object);
 
+  all_icon_factories = g_slist_remove (all_icon_factories, factory);
+  
   g_hash_table_foreach (factory->icons, free_icon_set, NULL);
   
   g_hash_table_destroy (factory->icons);
@@ -335,6 +340,42 @@ sized_icon_set_from_inline (const guchar *inline_data,
   return set;
 }
 
+
+static GtkIconSet *
+sized_with_fallback_icon_set_from_inline (const guchar *fallback_data,
+                                          const guchar *inline_data,
+                                          GtkIconSize   size)
+{
+  GtkIconSet *set;
+
+  GtkIconSource source = { NULL, NULL, 0, 0, 0,
+                           TRUE, TRUE, FALSE };
+
+  source.size = size;
+
+  set = gtk_icon_set_new ();
+
+  source.pixbuf = gdk_pixbuf_new_from_inline (inline_data, FALSE, -1, NULL);
+
+  g_assert (source.pixbuf);
+
+  gtk_icon_set_add_source (set, &source);
+
+  g_object_unref (G_OBJECT (source.pixbuf));
+  
+  source.any_size = TRUE;
+
+  source.pixbuf = gdk_pixbuf_new_from_inline (fallback_data, FALSE, -1, NULL);
+
+  g_assert (source.pixbuf);
+
+  gtk_icon_set_add_source (set, &source);
+
+  g_object_unref (G_OBJECT (source.pixbuf));  
+  
+  return set;
+}
+
 static GtkIconSet *
 unsized_icon_set_from_inline (const guchar *inline_data)
 {
@@ -372,6 +413,22 @@ add_sized (GtkIconFactory *factory,
   gtk_icon_set_unref (set);
 }
 
+static void
+add_sized_with_fallback (GtkIconFactory *factory,
+                         const guchar   *fallback_data,
+                         const guchar   *inline_data,
+                         GtkIconSize     size,
+                         const gchar    *stock_id)
+{
+  GtkIconSet *set;
+  
+  set = sized_with_fallback_icon_set_from_inline (fallback_data, inline_data, size);
+  
+  gtk_icon_factory_add (factory, stock_id, set);
+
+  gtk_icon_set_unref (set);
+}
+
 static void
 add_unsized (GtkIconFactory *factory,
              const guchar   *inline_data,
@@ -391,26 +448,98 @@ get_default_icons (GtkIconFactory *factory)
 {
   /* KEEP IN SYNC with gtkstock.c */
 
+  add_unsized (factory, MISSING_IMAGE_INLINE, GTK_STOCK_MISSING_IMAGE);
+  
   add_sized (factory, dialog_error, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_ERROR);
   add_sized (factory, dialog_info, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_INFO);
   add_sized (factory, dialog_question, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_QUESTION);
   add_sized (factory, dialog_warning, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_WARNING);
-
-  add_sized (factory, stock_button_apply, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_APPLY);
-  add_sized (factory, stock_button_ok, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_OK);
-  add_sized (factory, stock_button_cancel, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_CANCEL);
-  add_sized (factory, stock_button_close, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_CLOSE);
-  add_sized (factory, stock_button_yes, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_YES);
-  add_sized (factory, stock_button_no, GTK_ICON_SIZE_BUTTON, GTK_STOCK_BUTTON_NO);
-    
-  add_unsized (factory, stock_close, GTK_STOCK_CLOSE);
+  
+  /* Only have button sizes */
+  add_sized (factory, stock_button_apply, GTK_ICON_SIZE_BUTTON, GTK_STOCK_APPLY);
+  add_sized (factory, stock_button_cancel, GTK_ICON_SIZE_BUTTON, GTK_STOCK_CANCEL);
+  add_sized (factory, stock_button_no, GTK_ICON_SIZE_BUTTON, GTK_STOCK_NO);
+  add_sized (factory, stock_button_ok, GTK_ICON_SIZE_BUTTON, GTK_STOCK_OK);
+  add_sized (factory, stock_button_yes, GTK_ICON_SIZE_BUTTON, GTK_STOCK_YES);
+
+  /* Generic + button sizes */
+  add_sized_with_fallback (factory,
+                           stock_close,
+                           stock_button_close,
+                           GTK_ICON_SIZE_BUTTON,
+                           GTK_STOCK_CLOSE);
+
+  /* Generic + menu sizes */  
+
+  add_sized_with_fallback (factory,
+                           stock_print_preview,
+                           stock_menu_print_preview,
+                           GTK_ICON_SIZE_MENU,
+                           GTK_STOCK_PRINT_PREVIEW);
+
+  add_sized_with_fallback (factory,
+                           stock_sort_descending,
+                           stock_menu_sort_descending,
+                           GTK_ICON_SIZE_MENU,
+                           GTK_STOCK_SORT_DESCENDING);
+  
+  /* Generic size only */
+
+  add_unsized (factory, stock_add, GTK_STOCK_ADD);
+  add_unsized (factory, stock_align_center, GTK_STOCK_JUSTIFY_CENTER);
+  add_unsized (factory, stock_align_justify, GTK_STOCK_JUSTIFY_FILL);
+  add_unsized (factory, stock_align_left, GTK_STOCK_JUSTIFY_LEFT);
+  add_unsized (factory, stock_align_right, GTK_STOCK_JUSTIFY_RIGHT);
+  add_unsized (factory, stock_bottom, GTK_STOCK_GOTO_BOTTOM);  
+  add_unsized (factory, stock_cdrom, GTK_STOCK_CDROM);
+  add_unsized (factory, stock_clear, GTK_STOCK_CLEAR);
+  add_unsized (factory, stock_colorselector, GTK_STOCK_SELECT_COLOR);
+  add_unsized (factory, stock_convert, GTK_STOCK_CONVERT);
+  add_unsized (factory, stock_copy, GTK_STOCK_COPY);
+  add_unsized (factory, stock_cut, GTK_STOCK_CUT);
+  add_unsized (factory, stock_down_arrow, GTK_STOCK_GO_DOWN);
+  add_unsized (factory, stock_exec, GTK_STOCK_EXECUTE);
   add_unsized (factory, stock_exit, GTK_STOCK_QUIT);
+  add_unsized (factory, stock_first, GTK_STOCK_GOTO_FIRST);
+  add_unsized (factory, stock_font, GTK_STOCK_SELECT_FONT);
   add_unsized (factory, stock_help, GTK_STOCK_HELP);
+  add_unsized (factory, stock_home, GTK_STOCK_HOME);
+  add_unsized (factory, stock_index, GTK_STOCK_INDEX);
+  add_unsized (factory, stock_jump_to, GTK_STOCK_JUMP_TO);
+  add_unsized (factory, stock_last, GTK_STOCK_GOTO_LAST);
+  add_unsized (factory, stock_left_arrow, GTK_STOCK_GO_BACK);
   add_unsized (factory, stock_new, GTK_STOCK_NEW);
   add_unsized (factory, stock_open, GTK_STOCK_OPEN);
+  add_unsized (factory, stock_paste, GTK_STOCK_PASTE);
+  add_unsized (factory, stock_preferences, GTK_STOCK_PREFERENCES);
+  add_unsized (factory, stock_print, GTK_STOCK_PRINT);
+  add_unsized (factory, stock_properties, GTK_STOCK_PROPERTIES);
+  add_unsized (factory, stock_redo, GTK_STOCK_REDO);
+  add_unsized (factory, stock_refresh, GTK_STOCK_REFRESH);
+  add_unsized (factory, stock_remove, GTK_STOCK_REMOVE);
+  add_unsized (factory, stock_revert, GTK_STOCK_REVERT_TO_SAVED);
+  add_unsized (factory, stock_right_arrow, GTK_STOCK_GO_FORWARD);
+  add_unsized (factory, stock_save, GTK_STOCK_FLOPPY);
   add_unsized (factory, stock_save, GTK_STOCK_SAVE);
-
-  add_unsized (factory, MISSING_IMAGE_INLINE, GTK_STOCK_MISSING_IMAGE);
+  add_unsized (factory, stock_save_as, GTK_STOCK_SAVE_AS);
+  add_unsized (factory, stock_search, GTK_STOCK_FIND);
+  add_unsized (factory, stock_search_replace, GTK_STOCK_FIND_AND_REPLACE);
+  add_unsized (factory, stock_sort_ascending, GTK_STOCK_SORT_ASCENDING);
+  add_unsized (factory, stock_spellcheck, GTK_STOCK_SPELL_CHECK);
+  add_unsized (factory, stock_stop, GTK_STOCK_STOP);
+  add_unsized (factory, stock_text_bold, GTK_STOCK_BOLD);
+  add_unsized (factory, stock_text_italic, GTK_STOCK_ITALIC);
+  add_unsized (factory, stock_text_strikeout, GTK_STOCK_STRIKETHROUGH);
+  add_unsized (factory, stock_text_underline, GTK_STOCK_UNDERLINE);
+  add_unsized (factory, stock_top, GTK_STOCK_GOTO_TOP);
+  add_unsized (factory, stock_trash, GTK_STOCK_DELETE);
+  add_unsized (factory, stock_undelete, GTK_STOCK_UNDELETE);
+  add_unsized (factory, stock_undo, GTK_STOCK_UNDO);
+  add_unsized (factory, stock_up_arrow, GTK_STOCK_GO_UP);
+  add_unsized (factory, stock_zoom_1, GTK_STOCK_ZOOM_100);
+  add_unsized (factory, stock_zoom_fit, GTK_STOCK_ZOOM_FIT);
+  add_unsized (factory, stock_zoom_in, GTK_STOCK_ZOOM_IN);
+  add_unsized (factory, stock_zoom_out, GTK_STOCK_ZOOM_OUT);
 }
 
 /* Sizes */
@@ -929,17 +1058,26 @@ find_and_prep_icon_source (GtkIconSet       *icon_set,
 }
 
 static GdkPixbuf*
-get_fallback_image (void)
+render_fallback_image (GtkStyle          *style,
+                       GtkTextDirection   direction,
+                       GtkStateType       state,
+                       GtkIconSize        size,
+                       GtkWidget         *widget,
+                       const char        *detail)
 {
   /* This icon can be used for any direction/state/size */
-  static GdkPixbuf *pixbuf = NULL;
-
-  if (pixbuf == NULL)
-    pixbuf = gdk_pixbuf_new_from_inline (MISSING_IMAGE_INLINE, FALSE, -1, NULL);
-  else
-    g_object_ref (G_OBJECT (pixbuf));
+  static GtkIconSource fallback_source = { NULL, NULL, 0, 0, 0, TRUE, TRUE, TRUE };
 
-  return pixbuf;
+  if (fallback_source.pixbuf == NULL)
+    fallback_source.pixbuf = gdk_pixbuf_new_from_inline (MISSING_IMAGE_INLINE, FALSE, -1, NULL);
+  
+  return gtk_style_render_icon (style,
+                                &fallback_source,
+                                direction,
+                                state,
+                                size,
+                                widget,
+                                detail);
 }
 
 /**
@@ -977,7 +1115,7 @@ gtk_icon_set_render_icon (GtkIconSet        *icon_set,
   g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
 
   if (icon_set->sources == NULL)
-    return get_fallback_image ();
+    return render_fallback_image (style, direction, state, size, widget, detail);
   
   icon = find_in_cache (icon_set, style, direction,
                         state, size);
@@ -992,7 +1130,7 @@ gtk_icon_set_render_icon (GtkIconSet        *icon_set,
   source = find_and_prep_icon_source (icon_set, direction, state, size);
 
   if (source == NULL)
-    return get_fallback_image ();
+    return render_fallback_image (style, direction, state, size, widget, detail);
 
   g_assert (source->pixbuf != NULL);
   
@@ -1007,7 +1145,7 @@ gtk_icon_set_render_icon (GtkIconSet        *icon_set,
   if (icon == NULL)
     {
       g_warning ("Theme engine failed to render icon");
-      return get_fallback_image ();
+      return NULL;
     }
   
   add_to_cache (icon_set, style, direction, state, size, icon);
@@ -1093,6 +1231,86 @@ gtk_icon_set_add_source (GtkIconSet *icon_set,
                                              icon_source_compare);
 }
 
+/**
+ * gtk_icon_set_get_sizes:
+ * @icon_set: a #GtkIconSet
+ * @sizes: return location for array of sizes
+ * @n_sizes: location to store number of elements in returned array
+ *
+ * Obtains a list of icon sizes this icon set can render. The returned
+ * array must be freed with g_free().
+ * 
+ **/
+void
+gtk_icon_set_get_sizes (GtkIconSet   *icon_set,
+                        GtkIconSize **sizes,
+                        gint         *n_sizes)
+{
+  GSList *tmp_list;
+  gboolean all_sizes = FALSE;
+  GSList *specifics = NULL;
+  
+  g_return_if_fail (icon_set != NULL);
+  g_return_if_fail (sizes != NULL);
+  g_return_if_fail (n_sizes != NULL);
+  
+  tmp_list = icon_set->sources;
+  while (tmp_list != NULL)
+    {
+      GtkIconSource *source;
+
+      source = tmp_list->data;
+
+      if (source->any_size)
+        {
+          all_sizes = TRUE;
+          break;
+        }
+      else
+        specifics = g_slist_prepend (specifics, GINT_TO_POINTER (source->size));
+      
+      tmp_list = g_slist_next (tmp_list);
+    }
+
+  if (all_sizes)
+    {
+      /* Need to find out what sizes exist */
+      gint i;
+
+      init_icon_sizes ();
+      
+      *sizes = g_new (GtkIconSize, icon_sizes_used);
+      *n_sizes = icon_sizes_used;
+      
+      i = 0;      
+      while (i < icon_sizes_used)
+        {
+          (*sizes)[i] = icon_sizes[i].size;
+          ++i;
+        }
+    }
+  else
+    {
+      gint i;
+      
+      *n_sizes = g_slist_length (specifics);
+      *sizes = g_new (GtkIconSize, *n_sizes);
+
+      i = 0;
+      tmp_list = specifics;
+      while (tmp_list != NULL)
+        {
+          (*sizes)[i] = GPOINTER_TO_INT (tmp_list->data);
+
+          ++i;
+          tmp_list = g_slist_next (tmp_list);
+        }
+    }
+
+  g_slist_free (specifics);
+}
+
+
 /**
  * gtk_icon_source_new:
  * 
@@ -1803,3 +2021,55 @@ _gtk_icon_set_invalidate_caches (void)
 {
   ++cache_serial;
 }
+
+static void
+listify_foreach (gpointer key, gpointer value, gpointer data)
+{
+  GSList **list = data;
+
+  *list = g_slist_prepend (*list, key);
+}
+
+static GSList *
+g_hash_table_get_keys (GHashTable *table)
+{
+  GSList *list = NULL;
+
+  g_hash_table_foreach (table, listify_foreach, &list);
+
+  return list;
+}
+
+/**
+ * _gtk_icon_factory_list_ids:
+ * 
+ * Gets all known IDs stored in an existing icon factory.
+ * The strings in the returned list aren't copied.
+ * The list itself should be freed.
+ * 
+ * Return value: List of ids in icon factories
+ **/
+GSList*
+_gtk_icon_factory_list_ids (void)
+{
+  GSList *tmp_list;
+  GSList *ids;
+
+  ids = NULL;
+  
+  tmp_list = all_icon_factories;
+  while (tmp_list != NULL)
+    {
+      GSList *these_ids;
+      
+      GtkIconFactory *factory = GTK_ICON_FACTORY (tmp_list->data);
+
+      these_ids = g_hash_table_get_keys (factory->icons);
+      
+      ids = g_slist_concat (ids, these_ids);
+      
+      tmp_list = g_slist_next (tmp_list);
+    }
+
+  return ids;
+}
index c4b755af7c25098b0d2941ccfc9eefd8c919c33f..33c965cfccdb9521dc13b479751da72fe8cc9bc8 100644 (file)
@@ -117,6 +117,9 @@ GdkPixbuf*  gtk_icon_set_render_icon     (GtkIconSet      *icon_set,
 void           gtk_icon_set_add_source   (GtkIconSet          *icon_set,
                                           const GtkIconSource *source);
 
+void           gtk_icon_set_get_sizes    (GtkIconSet          *icon_set,
+                                          GtkIconSize        **sizes,
+                                          gint                *n_sizes);
 
 GtkIconSource* gtk_icon_source_new                      (void);
 GtkIconSource* gtk_icon_source_copy                     (const GtkIconSource *source);
@@ -152,6 +155,7 @@ GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *
 
 /* ignore this */
 void _gtk_icon_set_invalidate_caches (void);
+GSList* _gtk_icon_factory_list_ids (void);
 
 #ifdef __cplusplus
 }
index f37c96e97341ff68cb49de654b877986a446ae26..41d135f756fe1014864aa7a6e065d2a031599b23 100644 (file)
@@ -225,37 +225,37 @@ gtk_message_dialog_new (GtkWindow     *parent,
 
     case GTK_BUTTONS_OK:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_OK,
+                             GTK_STOCK_OK,
                              GTK_RESPONSE_OK);
       break;
 
     case GTK_BUTTONS_CLOSE:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_CLOSE,
+                             GTK_STOCK_CLOSE,
                              GTK_RESPONSE_CLOSE);
       break;
 
     case GTK_BUTTONS_CANCEL:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_CANCEL,
+                             GTK_STOCK_CANCEL,
                              GTK_RESPONSE_CANCEL);
       break;
 
     case GTK_BUTTONS_YES_NO:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_YES,
+                             GTK_STOCK_YES,
                              GTK_RESPONSE_YES);
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_NO,
+                             GTK_STOCK_NO,
                              GTK_RESPONSE_NO);
       break;
 
     case GTK_BUTTONS_OK_CANCEL:
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_OK,
+                             GTK_STOCK_OK,
                              GTK_RESPONSE_OK);
       gtk_dialog_add_button (dialog,
-                             GTK_STOCK_BUTTON_CANCEL,
+                             GTK_STOCK_CANCEL,
                              GTK_RESPONSE_CANCEL);
       break;
       
index 5f3349dfb3c640c8e5c2b1a1c9be90c9e76bcad5..02613c94c5ce288392cf468ac12f65768679e18e 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <string.h>
+
 #include "gtkstock.h"
+#include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
 
@@ -144,11 +147,11 @@ listify_foreach (gpointer key, gpointer value, gpointer data)
 {
   GSList **list = data;
 
-  *list = g_slist_prepend (*list, value);
+  *list = g_slist_prepend (*list, key);
 }
 
 static GSList *
-g_hash_table_get_values (GHashTable *table)
+g_hash_table_get_keys (GHashTable *table)
 {
   GSList *list = NULL;
 
@@ -158,20 +161,56 @@ g_hash_table_get_values (GHashTable *table)
 }
 
 /**
- * gtk_stock_list_items:
+ * gtk_stock_list_ids:
  * 
- * Retrieves a list of all known #GtkStockItem. The items are not copied;
- * they should not be freed. However, the list itself must be freed
- * with g_slist_free().
+ * Retrieves a list of all known stock IDs added to a #GtkIconFactory
+ * or registered with gtk_stock_add(). The list must be freed with g_slist_free(),
+ * and each string in the list must be freed with g_free().
  * 
- * Return value: a list of registered stock items
+ * Return value: a list of known stock IDs
  **/
-GSList *
-gtk_stock_list_items (void)
+GSList*
+gtk_stock_list_ids (void)
 {
+  GSList *ids;
+  GSList *icon_ids;
+  GSList *retval;
+  GSList *tmp_list;
+  const gchar *last_id;
+  
   init_stock_hash ();
 
-  return g_hash_table_get_values (stock_hash);
+  ids = g_hash_table_get_keys (stock_hash);
+  icon_ids = _gtk_icon_factory_list_ids ();
+  ids = g_slist_concat (ids, icon_ids);
+
+  ids = g_slist_sort (ids, (GCompareFunc)strcmp);
+
+  last_id = NULL;
+  retval = NULL;
+  tmp_list = ids;
+  while (tmp_list != NULL)
+    {
+      GSList *next;
+
+      next = g_slist_next (tmp_list);
+
+      if (last_id && strcmp (tmp_list->data, last_id) == 0)
+        {
+          /* duplicate, ignore */
+        }
+      else
+        {
+          retval = g_slist_prepend (retval, g_strdup (tmp_list->data));
+          last_id = tmp_list->data;
+        }
+
+      g_slist_free_1 (tmp_list);
+      
+      tmp_list = next;
+    }
+
+  return retval;
 }
 
 /**
@@ -223,26 +262,58 @@ gtk_stock_item_free (GtkStockItem *item)
 
 static GtkStockItem builtin_items [] =
 {
-  /* KEEP IN SYNC with gtkiconfactory.c stock icons */ 
+  /* KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate */ 
  
   { GTK_STOCK_DIALOG_INFO, N_("Information"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_DIALOG_WARNING, N_("Warning"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_DIALOG_ERROR, N_("Error"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_DIALOG_QUESTION, N_("Question"), 0, 0, GETTEXT_PACKAGE },
 
-  { GTK_STOCK_BUTTON_APPLY, N_("_Apply"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_BUTTON_OK, N_("_OK"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_BUTTON_CANCEL, N_("_Cancel"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_BUTTON_CLOSE, N_("_Close"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_BUTTON_YES, N_("_Yes"), 0, 0, GETTEXT_PACKAGE },
-  { GTK_STOCK_BUTTON_NO, N_("_No"), 0, 0, GETTEXT_PACKAGE },
-
+  /*  FIXME these need accelerators when appropriate, and
+   * need the mnemonics to be rationalized
+   */
+  { GTK_STOCK_APPLY, N_("_Apply"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_BOLD, N_("_Bold"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CANCEL, N_("_Cancel"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_CLEAR, N_("_Clear"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_CLOSE, N_("_Close"), GDK_CONTROL_MASK, 'w', GETTEXT_PACKAGE },
-  { GTK_STOCK_QUIT, N_("_Quit"), GDK_CONTROL_MASK, 'q', GETTEXT_PACKAGE },
+  { GTK_STOCK_COPY, N_("_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE },
+  { GTK_STOCK_CUT, N_("C_ut"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE },
+  { GTK_STOCK_FIND, N_("_Find"), GDK_CONTROL_MASK, 'f', GETTEXT_PACKAGE },
+  { GTK_STOCK_FIND_AND_REPLACE, N_("Find and _Replace"), GDK_CONTROL_MASK, 'r', GETTEXT_PACKAGE },
+  { GTK_STOCK_GO_BACK, N_("_Back"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_GO_FORWARD, N_("_Forward"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_HELP, N_("_Help"), GDK_CONTROL_MASK, 'h', GETTEXT_PACKAGE },
+  { GTK_STOCK_HOME, N_("_Home"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ITALIC, N_("_Italic"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_JUSTIFY_CENTER, N_("_Center"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_JUSTIFY_FILL, N_("_Fill"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_JUSTIFY_LEFT, N_("_Left"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_JUSTIFY_RIGHT, N_("_Right"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_NEW, N_("_New"), GDK_CONTROL_MASK, 'n', GETTEXT_PACKAGE },
+  { GTK_STOCK_NO, N_("_No"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_OK, N_("_OK"), 0, 0, GETTEXT_PACKAGE },
   { GTK_STOCK_OPEN, N_("_Open"), GDK_CONTROL_MASK, 'o', GETTEXT_PACKAGE },
-  { GTK_STOCK_SAVE, N_("_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE }
+  { GTK_STOCK_PASTE, N_("_Paste"), GDK_CONTROL_MASK, 'v', GETTEXT_PACKAGE },
+  { GTK_STOCK_PREFERENCES, N_("_Preferences"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PRINT, N_("_Print"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PRINT_PREVIEW, N_("Print Pre_view"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_PROPERTIES, N_("_Properties"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_QUIT, N_("_Quit"), GDK_CONTROL_MASK, 'q', GETTEXT_PACKAGE },
+  { GTK_STOCK_REDO, N_("_Redo"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_REVERT_TO_SAVED, N_("_Revert"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SAVE, N_("_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE },
+  { GTK_STOCK_SAVE_AS, N_("Save _As"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_SPELL_CHECK, N_("_Spell Check"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_STOP, N_("_Stop"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_STRIKETHROUGH, N_("_Strikethrough"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_UNDERLINE, N_("_Underline"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_UNDO, N_("_Undo"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_YES, N_("_Yes"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ZOOM_100, N_("Zoom _100%"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ZOOM_IN, N_("Zoom _In"), 0, 0, GETTEXT_PACKAGE },
+  { GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), 0, 0, GETTEXT_PACKAGE }
 };
 
 static void
index a613446168585dba2ea1408f4a856f8820f7f07c..fc8b40da66d3da0512b9cf12c8bdfa26275ce8fb 100644 (file)
@@ -52,16 +52,16 @@ void     gtk_stock_add_static (const GtkStockItem  *items,
 gboolean gtk_stock_lookup     (const gchar         *stock_id,
                                GtkStockItem        *item);
 
-/* Should free the list, but DO NOT modify the items in the list.
+/* Should free the list (and free each string in it also).
  * This function is only useful for GUI builders and such.
  */
-GSList*  gtk_stock_list_items  (void);
+GSList*  gtk_stock_list_ids  (void);
 
 GtkStockItem *gtk_stock_item_copy (const GtkStockItem *item);
 void          gtk_stock_item_free (GtkStockItem       *item);
 
 
-/* Stock IDs */
+/* Stock IDs (not all are stock items; some are images only) */
 #define GTK_STOCK_MISSING_IMAGE    "gtk-missing-image"
 
 #define GTK_STOCK_DIALOG_INFO      "gtk-dialog-info"
@@ -69,19 +69,69 @@ void          gtk_stock_item_free (GtkStockItem       *item);
 #define GTK_STOCK_DIALOG_ERROR     "gtk-dialog-error"
 #define GTK_STOCK_DIALOG_QUESTION  "gtk-dialog-question"
 
-#define GTK_STOCK_BUTTON_APPLY     "gtk-button-apply"
-#define GTK_STOCK_BUTTON_OK        "gtk-button-ok"
-#define GTK_STOCK_BUTTON_CANCEL    "gtk-button-cancel"
-#define GTK_STOCK_BUTTON_CLOSE     "gtk-button-close"
-#define GTK_STOCK_BUTTON_YES       "gtk-button-yes"
-#define GTK_STOCK_BUTTON_NO        "gtk-button-no"
-
+#define GTK_STOCK_ADD              "gtk-add"
+#define GTK_STOCK_APPLY            "gtk-apply"
+#define GTK_STOCK_BOLD             "gtk-bold"
+#define GTK_STOCK_CANCEL           "gtk-cancel"
+#define GTK_STOCK_CDROM            "gtk-cdrom"
+#define GTK_STOCK_CLEAR            "gtk-clear"
 #define GTK_STOCK_CLOSE            "gtk-close"
-#define GTK_STOCK_QUIT             "gtk-quit"
+#define GTK_STOCK_CONVERT          "gtk-convert"
+#define GTK_STOCK_COPY             "gtk-copy"
+#define GTK_STOCK_CUT              "gtk-cut"
+#define GTK_STOCK_DELETE           "gtk-delete"
+#define GTK_STOCK_EXECUTE          "gtk-execute"
+#define GTK_STOCK_FIND             "gtk-find"
+#define GTK_STOCK_FIND_AND_REPLACE "gtk-find-and-replace"
+#define GTK_STOCK_FLOPPY           "gtk-floppy"
+#define GTK_STOCK_GOTO_BOTTOM      "gtk-goto-bottom"
+#define GTK_STOCK_GOTO_FIRST       "gtk-goto-first"
+#define GTK_STOCK_GOTO_LAST        "gtk-goto-last"
+#define GTK_STOCK_GOTO_TOP         "gtk-goto-top"
+#define GTK_STOCK_GO_BACK          "gtk-go-back"
+#define GTK_STOCK_GO_DOWN          "gtk-go-down"
+#define GTK_STOCK_GO_FORWARD       "gtk-go-forward"
+#define GTK_STOCK_GO_UP            "gtk-up"
 #define GTK_STOCK_HELP             "gtk-help"
+#define GTK_STOCK_HOME             "gtk-home"
+#define GTK_STOCK_INDEX            "gtk-index"
+#define GTK_STOCK_ITALIC           "gtk-italic"
+#define GTK_STOCK_JUMP_TO          "gtk-jump-to"
+#define GTK_STOCK_JUSTIFY_CENTER   "gtk-justify-center"
+#define GTK_STOCK_JUSTIFY_FILL     "gtk-justify-fill"
+#define GTK_STOCK_JUSTIFY_LEFT     "gtk-justify-left"
+#define GTK_STOCK_JUSTIFY_RIGHT    "gtk-justify-right"
 #define GTK_STOCK_NEW              "gtk-new"
+#define GTK_STOCK_NO               "gtk-no"
+#define GTK_STOCK_OK               "gtk-ok"
 #define GTK_STOCK_OPEN             "gtk-open"
+#define GTK_STOCK_PASTE            "gtk-paste"
+#define GTK_STOCK_PREFERENCES      "gtk-preferences"
+#define GTK_STOCK_PRINT            "gtk-print"
+#define GTK_STOCK_PRINT_PREVIEW    "gtk-print-preview"
+#define GTK_STOCK_PROPERTIES       "gtk-properties"
+#define GTK_STOCK_QUIT             "gtk-quit"
+#define GTK_STOCK_REDO             "gtk-redo"
+#define GTK_STOCK_REFRESH          "gtk-refresh"
+#define GTK_STOCK_REMOVE           "gtk-remove"
+#define GTK_STOCK_REVERT_TO_SAVED  "gtk-revert-to-saved"
 #define GTK_STOCK_SAVE             "gtk-save"
+#define GTK_STOCK_SAVE_AS          "gtk-save-as"
+#define GTK_STOCK_SELECT_COLOR     "gtk-select-color"
+#define GTK_STOCK_SELECT_FONT      "gtk-select-font"
+#define GTK_STOCK_SORT_ASCENDING   "gtk-sort-ascending"
+#define GTK_STOCK_SORT_DESCENDING  "gtk-sort-descending"
+#define GTK_STOCK_SPELL_CHECK      "gtk-spell-check"
+#define GTK_STOCK_STOP             "gtk-stop"
+#define GTK_STOCK_STRIKETHROUGH    "gtk-strikethrough"
+#define GTK_STOCK_UNDELETE         "gtk-undelete"
+#define GTK_STOCK_UNDERLINE        "gtk-underline"
+#define GTK_STOCK_UNDO             "gtk-undo"
+#define GTK_STOCK_YES              "gtk-yes"
+#define GTK_STOCK_ZOOM_100         "gtk-zoom-100"
+#define GTK_STOCK_ZOOM_FIT         "gtk-zoom-fit"
+#define GTK_STOCK_ZOOM_IN          "gtk-zoom-in"
+#define GTK_STOCK_ZOOM_OUT         "gtk-zoom-out"
 
 #ifdef __cplusplus
 }
index d0bca99e8901d3053071b5a9aae155572aff7217..6641f75837abbaf10d2319f66d6157232f64a25c 100644 (file)
@@ -2283,6 +2283,9 @@ gtk_text_view_size_request (GtkWidget      *widget,
 
   text_view = GTK_TEXT_VIEW (widget);
 
+  text_view->text_window->requisition.width = text_view->layout->width;
+  text_view->text_window->requisition.height = text_view->layout->height;
+  
   requisition->width = text_view->text_window->requisition.width + FOCUS_EDGE_WIDTH * 2;
   requisition->height = text_view->text_window->requisition.height + FOCUS_EDGE_WIDTH * 2;
 
index 2895e4fe1ec63a01a6fda67e654200a91eaa6e51..a6e83137e5b3d539d23f643755d2070edc3fc556 100644 (file)
@@ -1015,8 +1015,8 @@ gtk_tree_view_size_request (GtkWidget      *widget,
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  requisition->width = 200;
-  requisition->height = 200;
+  requisition->width = tree_view->priv->width;
+  requisition->height = tree_view->priv->height + tree_view->priv->header_height;
 
   tmp_list = tree_view->priv->children;
 
@@ -6173,6 +6173,49 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
   return tree_view->priv->n_columns;
 }
 
+/**
+ * gtk_tree_view_insert_column_with_data_func:
+ * @tree_view: a #GtkTreeView
+ * @position: Position to insert, -1 for append
+ * @title: column title
+ * @cell: cell renderer for column
+ * @func: function to set attributes of cell renderer
+ * @data: data for @func
+ * @dnotify: destroy notifier for @data
+ * 
+ * Convenience function that inserts a new column into the #GtkTreeView
+ * with the given cell renderer and a #GtkCellDataFunc to set cell renderer
+ * attributes (normally using data from the model). See also
+ * gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_set_cell_renderer().
+ * 
+ * Return value: number of columns in the tree view post-insert
+ **/
+gint
+gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
+                                             gint                       position,
+                                             gchar                     *title,
+                                             GtkCellRenderer           *cell,
+                                             GtkCellDataFunc            func,
+                                             gpointer                   data,
+                                             GDestroyNotify             dnotify)
+{
+  GtkTreeViewColumn *column;
+
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
+
+  column = gtk_tree_view_column_new ();
+
+  gtk_tree_view_column_set_title (column, title);
+  gtk_tree_view_column_set_cell_renderer (column, cell);
+  gtk_tree_view_column_set_cell_data_func (column, func, data, dnotify);
+
+  gtk_tree_view_insert_column (tree_view, column, position);
+
+  g_object_unref (column);
+
+  return tree_view->priv->n_columns;
+}
+
 /**
  * gtk_tree_view_get_column:
  * @tree_view: A #GtkTreeView.
index 432e8e2f09d99a43b3e01414cf27fced0b607639..6568dbd00ffb9a3413791ea000135e9de87cc90d 100644 (file)
@@ -138,6 +138,13 @@ gint                   gtk_tree_view_insert_column_with_attributes (GtkTreeView
                                                                    gchar                     *title,
                                                                    GtkCellRenderer           *cell,
                                                                    ...);
+gint                   gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
+                                                                   gint                       position,
+                                                                   gchar                     *title,
+                                                                   GtkCellRenderer           *cell,
+                                                                    GtkCellDataFunc            func,
+                                                                    gpointer                   data,
+                                                                    GDestroyNotify             dnotify);
 GtkTreeViewColumn     *gtk_tree_view_get_column                    (GtkTreeView               *tree_view,
                                                                    gint                       n);
 GList                 *gtk_tree_view_get_columns                   (GtkTreeView               *tree_view);
index 385bc5447a5d74b759b49dbd296bb82d2237a8c8..03d6f8ea3189689e55c0379b6287cc23f89535d8 100644 (file)
@@ -4022,7 +4022,7 @@ gtk_widget_create_pango_layout (GtkWidget   *widget,
  * A convenience function that uses the theme engine and RC file
  * settings for @widget to look up @stock_id and render it to
  * a pixbuf. @stock_id should be a stock icon ID such as
- * #GTK_STOCK_OPEN or #GTK_STOCK_BUTTON_OK. @size should be a size
+ * #GTK_STOCK_OPEN or #GTK_STOCK_OK. @size should be a size
  * such as #GTK_ICON_SIZE_MENU. @detail should be a string that
  * identifies the widget or code doing the rendering, so that
  * theme engines can special-case rendering for that widget or code.
index 61f1d8a3c8396b64bf4cb565b905472893dd6619..29d5b6e2cf72ddf1a247f932cc04c4576439d28b 100644 (file)
 
-IMAGES = @STRIP_BEGIN@ \
-       dialog_error.png        \
-       dialog_info.png         \
-       dialog_question.png     \
-       dialog_warning.png      \
-       stock_button_apply.png  \
-       stock_button_cancel.png \
-       stock_button_close.png  \
-       stock_button_no.png     \
-       stock_button_ok.png     \
-       stock_button_yes.png    \
-       stock_close.png         \
-       stock_exit.png          \
-       stock_help.png          \
-       stock_new.png           \
-       stock_open.png          \
-       stock_save.png          \
+IMAGES = @STRIP_BEGIN@                         \
+       dialog_error.png                \
+       dialog_info.png                 \
+       dialog_question.png             \
+       dialog_warning.png              \
+       stock_add.png                   \
+       stock_align_center.png          \
+       stock_align_justify.png         \
+       stock_align_left.png            \
+       stock_align_right.png           \
+       stock_bottom.png                \
+       stock_button_apply.png          \
+       stock_button_cancel.png         \
+       stock_button_close.png          \
+       stock_button_no.png             \
+       stock_button_ok.png             \
+       stock_button_yes.png            \
+       stock_cdrom.png                 \
+       stock_clear.png                 \
+       stock_close.png                 \
+       stock_close.png                 \
+       stock_colorselector.png         \
+       stock_convert.png               \
+       stock_copy.png                  \
+       stock_cut.png                   \
+       stock_down_arrow.png            \
+       stock_exec.png                  \
+       stock_exit.png                  \
+       stock_first.png                 \
+       stock_font.png                  \
+       stock_help.png                  \
+       stock_help.png                  \
+       stock_home.png                  \
+       stock_index.png                 \
+       stock_jump_to.png               \
+       stock_last.png                  \
+       stock_left_arrow.png            \
+       stock_menu_print_preview.png    \
+       stock_menu_sort_descending.png  \
+       stock_new.png                   \
+       stock_open.png                  \
+       stock_paste.png                 \
+       stock_preferences.png           \
+       stock_print.png                 \
+       stock_print_preview.png         \
+       stock_properties.png            \
+       stock_redo.png                  \
+       stock_refresh.png               \
+       stock_remove.png                \
+       stock_revert.png                \
+       stock_right_arrow.png           \
+       stock_save.png                  \
+       stock_save_as.png               \
+       stock_search.png                \
+       stock_search_replace.png        \
+       stock_sort_ascending.png        \
+       stock_sort_descending.png       \
+       stock_spellcheck.png            \
+       stock_stop.png                  \
+       stock_text_bold.png             \
+       stock_text_italic.png           \
+       stock_text_strikeout.png        \
+       stock_text_underline.png        \
+       stock_top.png                   \
+       stock_trash.png                 \
+       stock_undelete.png              \
+       stock_undo.png                  \
+       stock_up_arrow.png              \
+       stock_zoom_1.png                \
+       stock_zoom_fit.png              \
+       stock_zoom_in.png               \
+       stock_zoom_out.png              \
 @STRIP_END@
 
-VARIABLES = @STRIP_BEGIN@ \
-               dialog_error            $(srcdir)/dialog_error.png      \
-               dialog_info             $(srcdir)/dialog_info.png       \
-               dialog_question         $(srcdir)/dialog_question.png   \
-               dialog_warning          $(srcdir)/dialog_warning.png    \
-               stock_button_apply      $(srcdir)/stock_button_apply.png  \
-               stock_button_cancel     $(srcdir)/stock_button_cancel.png \
-               stock_button_close      $(srcdir)/stock_button_close.png  \
-               stock_button_no         $(srcdir)/stock_button_no.png   \
-               stock_button_ok         $(srcdir)/stock_button_ok.png   \
-               stock_button_yes        $(srcdir)/stock_button_yes.png          \
-               stock_close             $(srcdir)/stock_close.png       \
-               stock_exit              $(srcdir)/stock_exit.png                \
-               stock_help              $(srcdir)/stock_help.png        \
-               stock_new               $(srcdir)/stock_new.png         \
-               stock_open              $(srcdir)/stock_open.png        \
-               stock_save              $(srcdir)/stock_save.png                \
+VARIABLES = @STRIP_BEGIN@                                                                      \
+               dialog_error                    $(srcdir)/dialog_error.png                      \
+               dialog_info                     $(srcdir)/dialog_info.png                       \
+               dialog_question                 $(srcdir)/dialog_question.png                   \
+               dialog_warning                  $(srcdir)/dialog_warning.png                    \
+               stock_add                       $(srcdir)/stock_add.png                         \
+               stock_align_justify             $(srcdir)/stock_align_justify.png               \
+               stock_align_left                $(srcdir)/stock_align_left.png                  \
+               stock_button_apply              $(srcdir)/stock_button_apply.png                \
+               stock_button_cancel             $(srcdir)/stock_button_cancel.png               \
+               stock_button_close              $(srcdir)/stock_button_close.png                \
+               stock_button_no                 $(srcdir)/stock_button_no.png                   \
+               stock_button_ok                 $(srcdir)/stock_button_ok.png                   \
+               stock_button_yes                $(srcdir)/stock_button_yes.png                  \
+               stock_align_center              $(srcdir)/stock_align_center.png                \
+               stock_align_right               $(srcdir)/stock_align_right.png                 \
+                stock_bottom                   $(srcdir)/stock_bottom.png                      \
+                stock_cdrom                    $(srcdir)/stock_cdrom.png                       \
+                stock_clear                    $(srcdir)/stock_clear.png                       \
+                stock_close                    $(srcdir)/stock_close.png                       \
+                stock_colorselector            $(srcdir)/stock_colorselector.png               \
+                stock_convert                  $(srcdir)/stock_convert.png                     \
+                stock_copy                     $(srcdir)/stock_copy.png                        \
+                stock_cut                      $(srcdir)/stock_cut.png                         \
+                stock_down_arrow               $(srcdir)/stock_down_arrow.png                  \
+                stock_exec                     $(srcdir)/stock_exec.png                        \
+               stock_exit                      $(srcdir)/stock_exit.png                        \
+                stock_first                    $(srcdir)/stock_first.png                       \
+                stock_font                     $(srcdir)/stock_font.png                        \
+                stock_help                     $(srcdir)/stock_help.png                        \
+                stock_home                     $(srcdir)/stock_home.png                        \
+                stock_index                    $(srcdir)/stock_index.png                       \
+                stock_jump_to                  $(srcdir)/stock_jump_to.png                     \
+                stock_last                     $(srcdir)/stock_last.png                        \
+                stock_left_arrow               $(srcdir)/stock_left_arrow.png                  \
+                stock_menu_print_preview       $(srcdir)/stock_menu_print_preview.png          \
+                stock_menu_sort_descending     $(srcdir)/stock_menu_sort_descending.png        \
+               stock_new                       $(srcdir)/stock_new.png                         \
+               stock_open                      $(srcdir)/stock_open.png                        \
+                stock_paste                    $(srcdir)/stock_paste.png                       \
+                stock_preferences              $(srcdir)/stock_preferences.png                 \
+                stock_print                    $(srcdir)/stock_print.png                       \
+                stock_print_preview            $(srcdir)/stock_print_preview.png               \
+                stock_properties               $(srcdir)/stock_properties.png                  \
+                stock_redo                     $(srcdir)/stock_redo.png                        \
+                stock_refresh                  $(srcdir)/stock_refresh.png                     \
+                stock_remove                   $(srcdir)/stock_remove.png                      \
+                stock_revert                   $(srcdir)/stock_revert.png                      \
+                stock_right_arrow              $(srcdir)/stock_right_arrow.png                 \
+               stock_save                      $(srcdir)/stock_save.png                        \
+                stock_save_as                  $(srcdir)/stock_save_as.png                     \
+                stock_search                   $(srcdir)/stock_search.png                      \
+                stock_search_replace           $(srcdir)/stock_search_replace.png              \
+                stock_sort_ascending           $(srcdir)/stock_sort_ascending.png              \
+                stock_sort_descending          $(srcdir)/stock_sort_descending.png             \
+                stock_spellcheck               $(srcdir)/stock_spellcheck.png                  \
+                stock_stop                     $(srcdir)/stock_stop.png                        \
+                stock_text_bold                        $(srcdir)/stock_text_bold.png                   \
+                stock_text_italic              $(srcdir)/stock_text_italic.png                 \
+                stock_text_strikeout           $(srcdir)/stock_text_strikeout.png              \
+                stock_text_underline           $(srcdir)/stock_text_underline.png              \
+                stock_top                      $(srcdir)/stock_top.png                         \
+                stock_trash                    $(srcdir)/stock_trash.png                       \
+                stock_undelete                 $(srcdir)/stock_undelete.png                    \
+                stock_undo                     $(srcdir)/stock_undo.png                        \
+                stock_up_arrow                 $(srcdir)/stock_up_arrow.png                    \
+                stock_zoom_1                   $(srcdir)/stock_zoom_1.png                      \
+                stock_zoom_fit                 $(srcdir)/stock_zoom_fit.png                    \
+                stock_zoom_in                  $(srcdir)/stock_zoom_in.png                     \
+                stock_zoom_out                 $(srcdir)/stock_zoom_out.png                    \
 @STRIP_END@
 
 noinst_DATA = gtkstockpixbufs.h
diff --git a/gtk/stock-icons/stock_add.png b/gtk/stock-icons/stock_add.png
new file mode 100644 (file)
index 0000000..62ddebe
Binary files /dev/null and b/gtk/stock-icons/stock_add.png differ
diff --git a/gtk/stock-icons/stock_add_24.png b/gtk/stock-icons/stock_add_24.png
new file mode 100644 (file)
index 0000000..62ddebe
Binary files /dev/null and b/gtk/stock-icons/stock_add_24.png differ
diff --git a/gtk/stock-icons/stock_align_center.png b/gtk/stock-icons/stock_align_center.png
new file mode 100644 (file)
index 0000000..b11ae62
Binary files /dev/null and b/gtk/stock-icons/stock_align_center.png differ
diff --git a/gtk/stock-icons/stock_align_center_24.png b/gtk/stock-icons/stock_align_center_24.png
new file mode 100644 (file)
index 0000000..b11ae62
Binary files /dev/null and b/gtk/stock-icons/stock_align_center_24.png differ
diff --git a/gtk/stock-icons/stock_align_justify.png b/gtk/stock-icons/stock_align_justify.png
new file mode 100644 (file)
index 0000000..964a9fb
Binary files /dev/null and b/gtk/stock-icons/stock_align_justify.png differ
diff --git a/gtk/stock-icons/stock_align_justify_24.png b/gtk/stock-icons/stock_align_justify_24.png
new file mode 100644 (file)
index 0000000..964a9fb
Binary files /dev/null and b/gtk/stock-icons/stock_align_justify_24.png differ
diff --git a/gtk/stock-icons/stock_align_left.png b/gtk/stock-icons/stock_align_left.png
new file mode 100644 (file)
index 0000000..c125dcc
Binary files /dev/null and b/gtk/stock-icons/stock_align_left.png differ
diff --git a/gtk/stock-icons/stock_align_left_24.png b/gtk/stock-icons/stock_align_left_24.png
new file mode 100644 (file)
index 0000000..c125dcc
Binary files /dev/null and b/gtk/stock-icons/stock_align_left_24.png differ
diff --git a/gtk/stock-icons/stock_align_right.png b/gtk/stock-icons/stock_align_right.png
new file mode 100644 (file)
index 0000000..8ac8632
Binary files /dev/null and b/gtk/stock-icons/stock_align_right.png differ
diff --git a/gtk/stock-icons/stock_align_right_24.png b/gtk/stock-icons/stock_align_right_24.png
new file mode 100644 (file)
index 0000000..8ac8632
Binary files /dev/null and b/gtk/stock-icons/stock_align_right_24.png differ
diff --git a/gtk/stock-icons/stock_bottom.png b/gtk/stock-icons/stock_bottom.png
new file mode 100644 (file)
index 0000000..c0d2035
Binary files /dev/null and b/gtk/stock-icons/stock_bottom.png differ
diff --git a/gtk/stock-icons/stock_bottom_24.png b/gtk/stock-icons/stock_bottom_24.png
new file mode 100644 (file)
index 0000000..c0d2035
Binary files /dev/null and b/gtk/stock-icons/stock_bottom_24.png differ
diff --git a/gtk/stock-icons/stock_cdrom.png b/gtk/stock-icons/stock_cdrom.png
new file mode 100644 (file)
index 0000000..a4f741d
Binary files /dev/null and b/gtk/stock-icons/stock_cdrom.png differ
diff --git a/gtk/stock-icons/stock_cdrom_24.png b/gtk/stock-icons/stock_cdrom_24.png
new file mode 100644 (file)
index 0000000..a4f741d
Binary files /dev/null and b/gtk/stock-icons/stock_cdrom_24.png differ
diff --git a/gtk/stock-icons/stock_clear.png b/gtk/stock-icons/stock_clear.png
new file mode 100644 (file)
index 0000000..96b6d57
Binary files /dev/null and b/gtk/stock-icons/stock_clear.png differ
diff --git a/gtk/stock-icons/stock_clear_24.png b/gtk/stock-icons/stock_clear_24.png
new file mode 100644 (file)
index 0000000..96b6d57
Binary files /dev/null and b/gtk/stock-icons/stock_clear_24.png differ
diff --git a/gtk/stock-icons/stock_colorselector.png b/gtk/stock-icons/stock_colorselector.png
new file mode 100644 (file)
index 0000000..2876ff2
Binary files /dev/null and b/gtk/stock-icons/stock_colorselector.png differ
diff --git a/gtk/stock-icons/stock_colorselector_24.png b/gtk/stock-icons/stock_colorselector_24.png
new file mode 100644 (file)
index 0000000..2876ff2
Binary files /dev/null and b/gtk/stock-icons/stock_colorselector_24.png differ
diff --git a/gtk/stock-icons/stock_convert.png b/gtk/stock-icons/stock_convert.png
new file mode 100644 (file)
index 0000000..e81e11d
Binary files /dev/null and b/gtk/stock-icons/stock_convert.png differ
diff --git a/gtk/stock-icons/stock_convert_24.png b/gtk/stock-icons/stock_convert_24.png
new file mode 100644 (file)
index 0000000..e81e11d
Binary files /dev/null and b/gtk/stock-icons/stock_convert_24.png differ
diff --git a/gtk/stock-icons/stock_copy.png b/gtk/stock-icons/stock_copy.png
new file mode 100644 (file)
index 0000000..c00e9d4
Binary files /dev/null and b/gtk/stock-icons/stock_copy.png differ
diff --git a/gtk/stock-icons/stock_copy_24.png b/gtk/stock-icons/stock_copy_24.png
new file mode 100644 (file)
index 0000000..c00e9d4
Binary files /dev/null and b/gtk/stock-icons/stock_copy_24.png differ
diff --git a/gtk/stock-icons/stock_cut.png b/gtk/stock-icons/stock_cut.png
new file mode 100644 (file)
index 0000000..ae8c7ed
Binary files /dev/null and b/gtk/stock-icons/stock_cut.png differ
diff --git a/gtk/stock-icons/stock_cut_24.png b/gtk/stock-icons/stock_cut_24.png
new file mode 100644 (file)
index 0000000..ae8c7ed
Binary files /dev/null and b/gtk/stock-icons/stock_cut_24.png differ
diff --git a/gtk/stock-icons/stock_down_arrow.png b/gtk/stock-icons/stock_down_arrow.png
new file mode 100644 (file)
index 0000000..f181a71
Binary files /dev/null and b/gtk/stock-icons/stock_down_arrow.png differ
diff --git a/gtk/stock-icons/stock_down_arrow_24.png b/gtk/stock-icons/stock_down_arrow_24.png
new file mode 100644 (file)
index 0000000..f181a71
Binary files /dev/null and b/gtk/stock-icons/stock_down_arrow_24.png differ
diff --git a/gtk/stock-icons/stock_exec.png b/gtk/stock-icons/stock_exec.png
new file mode 100644 (file)
index 0000000..62cb297
Binary files /dev/null and b/gtk/stock-icons/stock_exec.png differ
diff --git a/gtk/stock-icons/stock_exec_24.png b/gtk/stock-icons/stock_exec_24.png
new file mode 100644 (file)
index 0000000..62cb297
Binary files /dev/null and b/gtk/stock-icons/stock_exec_24.png differ
diff --git a/gtk/stock-icons/stock_first.png b/gtk/stock-icons/stock_first.png
new file mode 100644 (file)
index 0000000..af9ae0c
Binary files /dev/null and b/gtk/stock-icons/stock_first.png differ
diff --git a/gtk/stock-icons/stock_first_24.png b/gtk/stock-icons/stock_first_24.png
new file mode 100644 (file)
index 0000000..af9ae0c
Binary files /dev/null and b/gtk/stock-icons/stock_first_24.png differ
diff --git a/gtk/stock-icons/stock_font.png b/gtk/stock-icons/stock_font.png
new file mode 100644 (file)
index 0000000..de98dc1
Binary files /dev/null and b/gtk/stock-icons/stock_font.png differ
diff --git a/gtk/stock-icons/stock_font_24.png b/gtk/stock-icons/stock_font_24.png
new file mode 100644 (file)
index 0000000..de98dc1
Binary files /dev/null and b/gtk/stock-icons/stock_font_24.png differ
diff --git a/gtk/stock-icons/stock_home.png b/gtk/stock-icons/stock_home.png
new file mode 100644 (file)
index 0000000..0b2e9e6
Binary files /dev/null and b/gtk/stock-icons/stock_home.png differ
diff --git a/gtk/stock-icons/stock_home_24.png b/gtk/stock-icons/stock_home_24.png
new file mode 100644 (file)
index 0000000..0b2e9e6
Binary files /dev/null and b/gtk/stock-icons/stock_home_24.png differ
diff --git a/gtk/stock-icons/stock_index.png b/gtk/stock-icons/stock_index.png
new file mode 100644 (file)
index 0000000..1fd0f29
Binary files /dev/null and b/gtk/stock-icons/stock_index.png differ
diff --git a/gtk/stock-icons/stock_index_24.png b/gtk/stock-icons/stock_index_24.png
new file mode 100644 (file)
index 0000000..1fd0f29
Binary files /dev/null and b/gtk/stock-icons/stock_index_24.png differ
diff --git a/gtk/stock-icons/stock_jump_to.png b/gtk/stock-icons/stock_jump_to.png
new file mode 100644 (file)
index 0000000..880cf9a
Binary files /dev/null and b/gtk/stock-icons/stock_jump_to.png differ
diff --git a/gtk/stock-icons/stock_jump_to_24.png b/gtk/stock-icons/stock_jump_to_24.png
new file mode 100644 (file)
index 0000000..880cf9a
Binary files /dev/null and b/gtk/stock-icons/stock_jump_to_24.png differ
diff --git a/gtk/stock-icons/stock_last.png b/gtk/stock-icons/stock_last.png
new file mode 100644 (file)
index 0000000..9bd28bf
Binary files /dev/null and b/gtk/stock-icons/stock_last.png differ
diff --git a/gtk/stock-icons/stock_last_24.png b/gtk/stock-icons/stock_last_24.png
new file mode 100644 (file)
index 0000000..9bd28bf
Binary files /dev/null and b/gtk/stock-icons/stock_last_24.png differ
diff --git a/gtk/stock-icons/stock_left_arrow.png b/gtk/stock-icons/stock_left_arrow.png
new file mode 100644 (file)
index 0000000..5a1fe92
Binary files /dev/null and b/gtk/stock-icons/stock_left_arrow.png differ
diff --git a/gtk/stock-icons/stock_left_arrow_24.png b/gtk/stock-icons/stock_left_arrow_24.png
new file mode 100644 (file)
index 0000000..5a1fe92
Binary files /dev/null and b/gtk/stock-icons/stock_left_arrow_24.png differ
diff --git a/gtk/stock-icons/stock_menu_print_preview.png b/gtk/stock-icons/stock_menu_print_preview.png
new file mode 100644 (file)
index 0000000..2949e4c
Binary files /dev/null and b/gtk/stock-icons/stock_menu_print_preview.png differ
diff --git a/gtk/stock-icons/stock_menu_sort_descending.png b/gtk/stock-icons/stock_menu_sort_descending.png
new file mode 100644 (file)
index 0000000..bfb9c0b
Binary files /dev/null and b/gtk/stock-icons/stock_menu_sort_descending.png differ
diff --git a/gtk/stock-icons/stock_paste.png b/gtk/stock-icons/stock_paste.png
new file mode 100644 (file)
index 0000000..1f1b94a
Binary files /dev/null and b/gtk/stock-icons/stock_paste.png differ
diff --git a/gtk/stock-icons/stock_paste_24.png b/gtk/stock-icons/stock_paste_24.png
new file mode 100644 (file)
index 0000000..1f1b94a
Binary files /dev/null and b/gtk/stock-icons/stock_paste_24.png differ
diff --git a/gtk/stock-icons/stock_preferences.png b/gtk/stock-icons/stock_preferences.png
new file mode 100644 (file)
index 0000000..82b3eef
Binary files /dev/null and b/gtk/stock-icons/stock_preferences.png differ
diff --git a/gtk/stock-icons/stock_preferences_24.png b/gtk/stock-icons/stock_preferences_24.png
new file mode 100644 (file)
index 0000000..82b3eef
Binary files /dev/null and b/gtk/stock-icons/stock_preferences_24.png differ
diff --git a/gtk/stock-icons/stock_print.png b/gtk/stock-icons/stock_print.png
new file mode 100644 (file)
index 0000000..5213dff
Binary files /dev/null and b/gtk/stock-icons/stock_print.png differ
diff --git a/gtk/stock-icons/stock_print_24.png b/gtk/stock-icons/stock_print_24.png
new file mode 100644 (file)
index 0000000..5213dff
Binary files /dev/null and b/gtk/stock-icons/stock_print_24.png differ
diff --git a/gtk/stock-icons/stock_print_preview.png b/gtk/stock-icons/stock_print_preview.png
new file mode 100644 (file)
index 0000000..ca8f64b
Binary files /dev/null and b/gtk/stock-icons/stock_print_preview.png differ
diff --git a/gtk/stock-icons/stock_print_preview_16.png b/gtk/stock-icons/stock_print_preview_16.png
new file mode 100644 (file)
index 0000000..2949e4c
Binary files /dev/null and b/gtk/stock-icons/stock_print_preview_16.png differ
diff --git a/gtk/stock-icons/stock_print_preview_24.png b/gtk/stock-icons/stock_print_preview_24.png
new file mode 100644 (file)
index 0000000..ca8f64b
Binary files /dev/null and b/gtk/stock-icons/stock_print_preview_24.png differ
diff --git a/gtk/stock-icons/stock_properties.png b/gtk/stock-icons/stock_properties.png
new file mode 100644 (file)
index 0000000..5b638a6
Binary files /dev/null and b/gtk/stock-icons/stock_properties.png differ
diff --git a/gtk/stock-icons/stock_properties_24.png b/gtk/stock-icons/stock_properties_24.png
new file mode 100644 (file)
index 0000000..5b638a6
Binary files /dev/null and b/gtk/stock-icons/stock_properties_24.png differ
diff --git a/gtk/stock-icons/stock_redo.png b/gtk/stock-icons/stock_redo.png
new file mode 100644 (file)
index 0000000..e359590
Binary files /dev/null and b/gtk/stock-icons/stock_redo.png differ
diff --git a/gtk/stock-icons/stock_redo_24.png b/gtk/stock-icons/stock_redo_24.png
new file mode 100644 (file)
index 0000000..e359590
Binary files /dev/null and b/gtk/stock-icons/stock_redo_24.png differ
diff --git a/gtk/stock-icons/stock_refresh.png b/gtk/stock-icons/stock_refresh.png
new file mode 100644 (file)
index 0000000..81951b6
Binary files /dev/null and b/gtk/stock-icons/stock_refresh.png differ
diff --git a/gtk/stock-icons/stock_refresh_24.png b/gtk/stock-icons/stock_refresh_24.png
new file mode 100644 (file)
index 0000000..81951b6
Binary files /dev/null and b/gtk/stock-icons/stock_refresh_24.png differ
diff --git a/gtk/stock-icons/stock_remove.png b/gtk/stock-icons/stock_remove.png
new file mode 100644 (file)
index 0000000..23cd2d2
Binary files /dev/null and b/gtk/stock-icons/stock_remove.png differ
diff --git a/gtk/stock-icons/stock_remove_24.png b/gtk/stock-icons/stock_remove_24.png
new file mode 100644 (file)
index 0000000..23cd2d2
Binary files /dev/null and b/gtk/stock-icons/stock_remove_24.png differ
diff --git a/gtk/stock-icons/stock_revert.png b/gtk/stock-icons/stock_revert.png
new file mode 100644 (file)
index 0000000..9ef47a8
Binary files /dev/null and b/gtk/stock-icons/stock_revert.png differ
diff --git a/gtk/stock-icons/stock_revert_24.png b/gtk/stock-icons/stock_revert_24.png
new file mode 100644 (file)
index 0000000..9ef47a8
Binary files /dev/null and b/gtk/stock-icons/stock_revert_24.png differ
diff --git a/gtk/stock-icons/stock_right_arrow.png b/gtk/stock-icons/stock_right_arrow.png
new file mode 100644 (file)
index 0000000..d16216c
Binary files /dev/null and b/gtk/stock-icons/stock_right_arrow.png differ
diff --git a/gtk/stock-icons/stock_right_arrow_24.png b/gtk/stock-icons/stock_right_arrow_24.png
new file mode 100644 (file)
index 0000000..d16216c
Binary files /dev/null and b/gtk/stock-icons/stock_right_arrow_24.png differ
diff --git a/gtk/stock-icons/stock_save_as.png b/gtk/stock-icons/stock_save_as.png
new file mode 100644 (file)
index 0000000..13cc1bf
Binary files /dev/null and b/gtk/stock-icons/stock_save_as.png differ
diff --git a/gtk/stock-icons/stock_save_as_24.png b/gtk/stock-icons/stock_save_as_24.png
new file mode 100644 (file)
index 0000000..13cc1bf
Binary files /dev/null and b/gtk/stock-icons/stock_save_as_24.png differ
diff --git a/gtk/stock-icons/stock_search.png b/gtk/stock-icons/stock_search.png
new file mode 100644 (file)
index 0000000..db20813
Binary files /dev/null and b/gtk/stock-icons/stock_search.png differ
diff --git a/gtk/stock-icons/stock_search_24.png b/gtk/stock-icons/stock_search_24.png
new file mode 100644 (file)
index 0000000..db20813
Binary files /dev/null and b/gtk/stock-icons/stock_search_24.png differ
diff --git a/gtk/stock-icons/stock_search_replace.png b/gtk/stock-icons/stock_search_replace.png
new file mode 100644 (file)
index 0000000..895201d
Binary files /dev/null and b/gtk/stock-icons/stock_search_replace.png differ
diff --git a/gtk/stock-icons/stock_search_replace_24.png b/gtk/stock-icons/stock_search_replace_24.png
new file mode 100644 (file)
index 0000000..895201d
Binary files /dev/null and b/gtk/stock-icons/stock_search_replace_24.png differ
diff --git a/gtk/stock-icons/stock_sort_ascending.png b/gtk/stock-icons/stock_sort_ascending.png
new file mode 100644 (file)
index 0000000..5b9e630
Binary files /dev/null and b/gtk/stock-icons/stock_sort_ascending.png differ
diff --git a/gtk/stock-icons/stock_sort_ascending_24.png b/gtk/stock-icons/stock_sort_ascending_24.png
new file mode 100644 (file)
index 0000000..5b9e630
Binary files /dev/null and b/gtk/stock-icons/stock_sort_ascending_24.png differ
diff --git a/gtk/stock-icons/stock_sort_descending.png b/gtk/stock-icons/stock_sort_descending.png
new file mode 100644 (file)
index 0000000..37abbf6
Binary files /dev/null and b/gtk/stock-icons/stock_sort_descending.png differ
diff --git a/gtk/stock-icons/stock_sort_descending_16.png b/gtk/stock-icons/stock_sort_descending_16.png
new file mode 100644 (file)
index 0000000..bfb9c0b
Binary files /dev/null and b/gtk/stock-icons/stock_sort_descending_16.png differ
diff --git a/gtk/stock-icons/stock_sort_descending_24.png b/gtk/stock-icons/stock_sort_descending_24.png
new file mode 100644 (file)
index 0000000..37abbf6
Binary files /dev/null and b/gtk/stock-icons/stock_sort_descending_24.png differ
diff --git a/gtk/stock-icons/stock_spellcheck.png b/gtk/stock-icons/stock_spellcheck.png
new file mode 100644 (file)
index 0000000..8093dcd
Binary files /dev/null and b/gtk/stock-icons/stock_spellcheck.png differ
diff --git a/gtk/stock-icons/stock_spellcheck_24.png b/gtk/stock-icons/stock_spellcheck_24.png
new file mode 100644 (file)
index 0000000..8093dcd
Binary files /dev/null and b/gtk/stock-icons/stock_spellcheck_24.png differ
diff --git a/gtk/stock-icons/stock_stop.png b/gtk/stock-icons/stock_stop.png
new file mode 100644 (file)
index 0000000..b092118
Binary files /dev/null and b/gtk/stock-icons/stock_stop.png differ
diff --git a/gtk/stock-icons/stock_stop_24.png b/gtk/stock-icons/stock_stop_24.png
new file mode 100644 (file)
index 0000000..b092118
Binary files /dev/null and b/gtk/stock-icons/stock_stop_24.png differ
diff --git a/gtk/stock-icons/stock_text_bold.png b/gtk/stock-icons/stock_text_bold.png
new file mode 100644 (file)
index 0000000..1319deb
Binary files /dev/null and b/gtk/stock-icons/stock_text_bold.png differ
diff --git a/gtk/stock-icons/stock_text_bold_24.png b/gtk/stock-icons/stock_text_bold_24.png
new file mode 100644 (file)
index 0000000..1319deb
Binary files /dev/null and b/gtk/stock-icons/stock_text_bold_24.png differ
diff --git a/gtk/stock-icons/stock_text_italic.png b/gtk/stock-icons/stock_text_italic.png
new file mode 100644 (file)
index 0000000..2712337
Binary files /dev/null and b/gtk/stock-icons/stock_text_italic.png differ
diff --git a/gtk/stock-icons/stock_text_italic_24.png b/gtk/stock-icons/stock_text_italic_24.png
new file mode 100644 (file)
index 0000000..2712337
Binary files /dev/null and b/gtk/stock-icons/stock_text_italic_24.png differ
diff --git a/gtk/stock-icons/stock_text_strikeout.png b/gtk/stock-icons/stock_text_strikeout.png
new file mode 100644 (file)
index 0000000..9a9a373
Binary files /dev/null and b/gtk/stock-icons/stock_text_strikeout.png differ
diff --git a/gtk/stock-icons/stock_text_strikeout_24.png b/gtk/stock-icons/stock_text_strikeout_24.png
new file mode 100644 (file)
index 0000000..9a9a373
Binary files /dev/null and b/gtk/stock-icons/stock_text_strikeout_24.png differ
diff --git a/gtk/stock-icons/stock_text_strikethrough_24.png b/gtk/stock-icons/stock_text_strikethrough_24.png
new file mode 100644 (file)
index 0000000..9a9a373
Binary files /dev/null and b/gtk/stock-icons/stock_text_strikethrough_24.png differ
diff --git a/gtk/stock-icons/stock_text_underline.png b/gtk/stock-icons/stock_text_underline.png
new file mode 100644 (file)
index 0000000..35f5c1f
Binary files /dev/null and b/gtk/stock-icons/stock_text_underline.png differ
diff --git a/gtk/stock-icons/stock_text_underline_24.png b/gtk/stock-icons/stock_text_underline_24.png
new file mode 100644 (file)
index 0000000..35f5c1f
Binary files /dev/null and b/gtk/stock-icons/stock_text_underline_24.png differ
diff --git a/gtk/stock-icons/stock_top.png b/gtk/stock-icons/stock_top.png
new file mode 100644 (file)
index 0000000..7ebb6c8
Binary files /dev/null and b/gtk/stock-icons/stock_top.png differ
diff --git a/gtk/stock-icons/stock_top_24.png b/gtk/stock-icons/stock_top_24.png
new file mode 100644 (file)
index 0000000..7ebb6c8
Binary files /dev/null and b/gtk/stock-icons/stock_top_24.png differ
diff --git a/gtk/stock-icons/stock_trash.png b/gtk/stock-icons/stock_trash.png
new file mode 100644 (file)
index 0000000..1c70b72
Binary files /dev/null and b/gtk/stock-icons/stock_trash.png differ
diff --git a/gtk/stock-icons/stock_trash_24.png b/gtk/stock-icons/stock_trash_24.png
new file mode 100644 (file)
index 0000000..1c70b72
Binary files /dev/null and b/gtk/stock-icons/stock_trash_24.png differ
diff --git a/gtk/stock-icons/stock_undelete.png b/gtk/stock-icons/stock_undelete.png
new file mode 100644 (file)
index 0000000..faff910
Binary files /dev/null and b/gtk/stock-icons/stock_undelete.png differ
diff --git a/gtk/stock-icons/stock_undelete_24.png b/gtk/stock-icons/stock_undelete_24.png
new file mode 100644 (file)
index 0000000..faff910
Binary files /dev/null and b/gtk/stock-icons/stock_undelete_24.png differ
diff --git a/gtk/stock-icons/stock_undo.png b/gtk/stock-icons/stock_undo.png
new file mode 100644 (file)
index 0000000..601a1fa
Binary files /dev/null and b/gtk/stock-icons/stock_undo.png differ
diff --git a/gtk/stock-icons/stock_undo_24.png b/gtk/stock-icons/stock_undo_24.png
new file mode 100644 (file)
index 0000000..601a1fa
Binary files /dev/null and b/gtk/stock-icons/stock_undo_24.png differ
diff --git a/gtk/stock-icons/stock_up_arrow.png b/gtk/stock-icons/stock_up_arrow.png
new file mode 100644 (file)
index 0000000..4bb674b
Binary files /dev/null and b/gtk/stock-icons/stock_up_arrow.png differ
diff --git a/gtk/stock-icons/stock_up_arrow_24.png b/gtk/stock-icons/stock_up_arrow_24.png
new file mode 100644 (file)
index 0000000..4bb674b
Binary files /dev/null and b/gtk/stock-icons/stock_up_arrow_24.png differ
diff --git a/gtk/stock-icons/stock_zoom_1.png b/gtk/stock-icons/stock_zoom_1.png
new file mode 100644 (file)
index 0000000..10507a8
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_1.png differ
diff --git a/gtk/stock-icons/stock_zoom_1_24.png b/gtk/stock-icons/stock_zoom_1_24.png
new file mode 100644 (file)
index 0000000..10507a8
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_1_24.png differ
diff --git a/gtk/stock-icons/stock_zoom_fit.png b/gtk/stock-icons/stock_zoom_fit.png
new file mode 100644 (file)
index 0000000..26b089c
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_fit.png differ
diff --git a/gtk/stock-icons/stock_zoom_fit_24.png b/gtk/stock-icons/stock_zoom_fit_24.png
new file mode 100644 (file)
index 0000000..26b089c
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_fit_24.png differ
diff --git a/gtk/stock-icons/stock_zoom_in.png b/gtk/stock-icons/stock_zoom_in.png
new file mode 100644 (file)
index 0000000..3a18e63
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_in.png differ
diff --git a/gtk/stock-icons/stock_zoom_in_24.png b/gtk/stock-icons/stock_zoom_in_24.png
new file mode 100644 (file)
index 0000000..3a18e63
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_in_24.png differ
diff --git a/gtk/stock-icons/stock_zoom_out.png b/gtk/stock-icons/stock_zoom_out.png
new file mode 100644 (file)
index 0000000..f398bbc
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_out.png differ
diff --git a/gtk/stock-icons/stock_zoom_out_24.png b/gtk/stock-icons/stock_zoom_out_24.png
new file mode 100644 (file)
index 0000000..f398bbc
Binary files /dev/null and b/gtk/stock-icons/stock_zoom_out_24.png differ
index a6502591826f1ea4ba26386d8fdd6d5b3e68c084..b6dc0861e4e4f9f8e89d4cecd163a5c36766e27c 100644 (file)
@@ -194,11 +194,11 @@ create_buttons (void)
       button[0] = gtk_button_new_with_label ("button1");
       button[1] = gtk_button_new_with_mnemonic ("_button2");
       button[2] = gtk_button_new_with_mnemonic ("_button3");
-      button[3] = gtk_button_new_from_stock (GTK_STOCK_BUTTON_OK);
+      button[3] = gtk_button_new_from_stock (GTK_STOCK_OK);
       button[4] = gtk_button_new_with_label ("button5");
       button[5] = gtk_button_new_with_label ("button6");
       button[6] = gtk_button_new_with_label ("button7");
-      button[7] = gtk_button_new_from_stock (GTK_STOCK_BUTTON_CLOSE);
+      button[7] = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
       button[8] = gtk_button_new_with_label ("button9");
       
       gtk_signal_connect (GTK_OBJECT (button[0]), "clicked",
@@ -3677,7 +3677,7 @@ create_size_group_window (GtkSizeGroup *master_size_group)
 
   window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
                                        NULL, 0,
-                                       GTK_STOCK_BUTTON_CLOSE,
+                                       GTK_STOCK_CLOSE,
                                        GTK_RESPONSE_NONE,
                                        NULL);
 
@@ -6381,7 +6381,7 @@ create_focus (void)
       
       window = gtk_dialog_new_with_buttons ("Keyboard focus navigation",
                                             NULL, 0,
-                                            GTK_STOCK_BUTTON_CLOSE,
+                                            GTK_STOCK_CLOSE,
                                             GTK_RESPONSE_NONE,
                                             NULL);
 
index 476592efe49564b28674ead5b0810c20c56e5caf..c0b171454e40d2e7968d636fe1e49c4f63c65ae5 100644 (file)
@@ -1149,7 +1149,7 @@ do_search (gpointer callback_data,
                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                         "Forward", RESPONSE_FORWARD,
                                         "Backward", RESPONSE_BACKWARD,
-                                        GTK_STOCK_BUTTON_CANCEL,
+                                        GTK_STOCK_CANCEL,
                                         GTK_RESPONSE_NONE, NULL);